Style headers
Dunno
Merge remote-tracking branch 'cove/master'
Little stuff
Merge with jack