A few more tweaks to comments