fixed the last of Will's comments--now it is ready to be reviewed for pull request. YAY.