various comment tone fixes