Added additional TokTypes and pretty printed them. Turned state strings into enums