path changes and minor error fixes
Merge branch 'development'