Re-enabled ending turns
Added battle end handling