Some updates to submit to CRAN

Fingers crossed :)