small updates per Jamie's comments