Fix structure
Minor heading fixes