fixes to battle controllers again and powerUps