Cleanup, getting ready for v 1.0 to submit to CRAN.