Improvements to lexer, and made it look pretty.