Fixed formatting for AnswerString, and committed changes to BattleState.