mikkelkrogsholm A lot of smaller changes to make it CRAN - compliant