Rewrite Timer Trigger so it actually works...

...and add Clock Timer Gate Expansion.