block comment corrections
merge done