More comment tweaks