combat unit fixed
sources reformatted