fixed some lexer problems