small corrections
merge