Added MasterSwitch tag, minor fixes