more changes in preparation for release