BattleEngine: various Bugfixes