minor tweaks, comments