Fixing issues with R CMD check ... mostly man page problems.
pulled Dave's last changes and fixed conflicts