Update to conform to CRAN rules (unfinished)