More little changes based on feedback.