fixes
ready for stable release
Finish fixes-for-release