add endAttack/endTurn + fix some problems