Added DigitalSwitch override (press start) and some cleanup