more tweaks, comments