Timer Fix

Fixed some issues with the in-game timer