fix code
fix escaping
commit all edge cases