small fixes and formatting
Merge branch 'master' into dev