several bug fixes
Merge branch 'development' into qa