battles improved, still need tweaking