Changing the Lexer so far still have a few problems (generating errors)