Battle stuff and random fixes