fixed: specs + token generator + various