Some battle structure improvements.