fix typos
code cleanup
fix lexer pushBack bug