more minor changes based of Brian's feedback