Minor edits

Moved around a couple of things and added something here and there but
no major edits.