Cleanup, fix some escaping