minor fixes in the lexer
started working on the parser