tokens file: added; improvements