A few minor changes based on feedback.