Some satch file adjustments and improvements.