More stuff
Small fixes
Some more fixes to escape entities