Fix a bunch of issues with battles