minor tweaks, Michael's suggestions