Fixed some update and time issues