Lexer fixes, Parser continued
End of first session.