minor fixes to make output prior and later identical