Bug fixes and introducing timers