Renamed switch buttons and associated methods/variables to make more sense. Switch buttons appear to be working