pre-release improvements

Several further pre-release improvements.