Bugs/missing token generation

Either my PR was bad or something bad happened since then.

either way, this unbreaks calculon