fixing links
adjusted formats
demote headers
demoting more headers
more typesafe