fixed some lexer bugs and added variable declarations