add lables
adjust headings
change heading
gerneral cleanup