fixes to battle controllers