Make all necessary changes for CRAN, plays well with others now...