some more refinements following rehearsal