fixed misc issues
Merge branch 'development' into staging