Fixed minor stuff with timers and un-used variables