lots of changes in preparation for release