namespace updates

plus the regular dev version of roxygen changes