First set of updates to prepare package for CRAN.