Battle fixes & improvements