This pull is any last minute changes and fixes

Rather than merging all these "I just realized" moments, I'll just leave this open for a few hours to batch it all together. It will end up getting chained on to the r6 branch commit much cleaner that way.