Minor fixes on BattleSurface
Minor changes in BattleSurface