Redesigned stopping mechanic of the timer (relates to #32)