Fixed lexing bugs, added more tokens, added parts of parser