H1, few more style improvements.
Merge branch 'master' into finished