minor changes to get onto CRAN