Fixed output mistakes