Fixed up tokens even more