Fixing some of Adam's comments.