general configuration tweaks and tokens added