changed some small stuff as to how TimerService works