Add a few more escape calls to prevent nasty HTML being rendered. Also