Numerous improvements, including a timer rewrite