Prep for Switchable 40/80 columns and misc editing