Game timer, fixes ..
Merge and fix