minor changes per bobby/derek's comments