more fixes from Brian's feedback