updates from brandon's feedback