Fixes typo
Fixes header hierarchy and other things