fix timer, first server refactoring