many misc changes from last meeting