[UPDATE] minor changes and fixes
Merge branch 'development'