fix error formatting & part matching