Misc edits

Some miscellaneous fleshing out of certain sections.