Some more changes based on feedback.