A few changes based on mom's feedback.