Sorted out battle logic for turns and some cleanup of the issues.