Battle changes/fixes