pre-release improvements

Several further pre-release improvements.  
and moved at the beginning?