Several edits here and there. Use git diff.