Use escape & translate functions were necessary

Since translating anything opens up the possibility that malicious code could be introduced, we should escape everything that has been translated on output. 

If you merge this into yours... I'm happy to merge yours into ours! If that makes sense!

Thanks again for your work on this.