Fixed bugs. Battle events working