comment tweaks and stuff