Dropbox Edits 29/11 - 1730

Edits to general formatting, addition of more of Ashwin's work.