Fixed various battle bugs