fixed the auto toggle of the switch values.  The Pushbutton is now dynamic and holds state values as well.