Auto battle improvements