Much improved parsing!
More string tests
Fixing some token parsing stuff