Fix ordering on token handling
Fixed bug in dot parsing