code review fixes + escape some more reserved chars