minor
merged, game state timer