various fixes for next version
various fixes for next version
merge in september fixes