updates from craig's comments