minor tweaks to prior commit