Various updates in preparation for release