Pull request for various patches

Over roughly a week rather than a few days this time :D