BattleServer
Further improvements on BattleServer