some minor tweaks and comments