Escaping and translation fixes and some other minor issues