fix some additional bugs in relation to timers
fix some additional bugs in relation to timers

Liamraystanley/marill,lrstanley/marill,Liamraystanley/marill,lrstanley/marill,Liamraystanley/marill,lrstanley/marill