a few more tweaks and comments