Various small fixes

Improved how tokens are displayed. Useful for error messages when parsing fails.