Minor changes to ensure NAMESPACE is complete so that tests run
Additional minor documentation changes