Fix a lot of things, simplifies token processing