More tweaks to comments