Fixes for serial assy, order taxing, contact tax