comment block fixes