more battle fixes