Fixed / Finished Work on timers, events & actions