Pull request for various things

Yay, things. In variousness!