Nice layout for parsing using states
Undid some of Kevin's magic show commands to support the parser better.