Patch

Stuff. See commit messages.