fixed some code escaping