Updates for new CRAN submission