Mostly comment tweaks