Added some tweaks to the Timer system, etc.