Updates for CRAN submission