minor tweaks and comments