reorganize timer/other stuff