first round of changes from Mike's feedback.