comments and fixes from review session with tim.