Updates; remove CLI defaults as it breaks defulting in json; add in test files.
Doc and Style updates.