lots of fixes to get ready for a release candidate