Added timers + fixes