Moved around some headings in BNDN and added some new