Minor code improvement (thanks uroboro). Enable/Disable switch now takes effect instantly.