Lots of edits, adding various links, some reorg