updated all the style bits
no reason
Merge branch 'develop' into staging