Just a lexer, and fix naming of HYPHEN
Move some parts into the lexer
Various fixes