fixes to main switches