Final Fixes

Continuing work on the patch, these are the last bunch of additions before it goes live (as I type this out, it might even have gone live already!)

((Actually I now know it has, since this post, as usual with the Friday posts, has been delayed ;)))