Lexer changes

Mostly minor things that rebasing is becoming painful.
Well, I had to add it all in and rip it all out, figured I might as well make it easy to add it back in.