more changes based on PR feedback from pamelafox