fixed timer countdown
Merge branch 'owenFixes'