tweaks, pre total map conversion