Major Roxygen2 cleanup.  Some additions.