Last round of revisions and some formatting fixes