Added line numbers and line position numbers to the tokens. Cleaned up some of the Lexer code to make it more standard.