Initial edits.

More will come, but this is all for tonight.