Patch 1

Looks like someone is editing the master as I write this, so some of these changes aren't intended, hopefully you'll find some of them useful despite this!