Pre-release changes

lots