Slimmed down previous lex file and removed most of the ENUM, fixed token defs, fixed compilation issues with naming.