updates from Sam's comments