Lots of updates based on feedback.