BattleEngine: Fixed several different Bugs