mostly aesthetics
Merge branch 'dev'