Bug fixes and improvements to Wall light switching