Various changes for organization and tabular layout

Also included a lot of new appendix material