fix escaping and stuff