various tweaks, prepping for CRAN release