pre-release improvements

Several further pre-release improvements.  
Actually `noqa` can be removed now...