corrected remainder of bugs with the lexer