Some final edits; should've used rebase -i ...