no more exceptions but still issues with battle not ending when it's supposed to