Adding better heading structure and new notes