few fixes
fixed a few bugs
Merge branch 'development' into qa