More comment display fixes.