couple more small tweaks prior to resubmitting to cran