Bug fix and added new commands to LightSwitchHandler