updates from Matt's comments