Fine tuning of autoOn/autoOff code.  Seems reliable and lean now