Many tweaks. Partially implemented Kathy's written changes.