minor tweaks thanks to feedback from Gail Adler