More token types

make custom token types for all appropriate parts of the parse result so that they can be properly distinguished in the output.