first wave of base template tweaks and cleanup