Fixed some update problems with timeon/off