small corrections
merging