Minor tweaks, comments