Improve Timer related things (again).

Signed-off-by: mk124 <mk124a@gmail.com>