small mods to code
cosmetic
merged.
added one test that will currently fail - to fix tomorrow.  config tests
are a work in progress.