some cleanup; begin getting ready for a CRAN submission