pull request for 14 commits

Precisely 14, hooray.