added some better handling of the tokens file now only loaded if present