A few tweaks to comments