Add timer events
Various fixes.