comments & minor tweaks