Minor changes.  All tests work.