whitespace and comment tweaks.