moar comment tweaks