small styling fixes
Merge origin/master
Merge origin/master
preparing for release, last styling fixes