more cleanup, deleted a lot more unnecessary lexer stuff and moved OUTPUT option to reservered keywords