-- remove some warnings, reset timer properly after loading