Added new Timer, small tweaks