move shutup timeout to definition file
update second-precision timers to millisecond precision