fix some issues with comments