Minor timer bugs solved.