cleanup
refined time checks, continuing update controller