Bug & syntax fixes
Merge branch 'dev'