some more tweaks, comments