and more defect fixes
Merge branch 'develop' of github.com:csound/csound into develop