breakup overly long lines
add fixme
rename GameState(..) to RoundState(..)
s/Game/SurvivalState/