more tweaks to base