improved the switch control axioms, associated changes