Updated some errors, 2 escape errros remain. Next commit will fix!