Minor changes in preparation for release of package