updates for second CRAN submission attempt.