fixing on/off buttons
more fixes