Added switch to toggle without reboot

Fixed bugs