prepping failsafe changes, and slight rework of new button logic.