Various fixes

So this release is out and in the wild now (so to speak) - it's being tested for a live environment over the next week or so and I hope to be able to publish a video of the tool in use during this time. I expect some issues to be found once those pesky content editors get their (clumsy, clumsy, clumsy) hands on it but ultimately that will just speed up the process of getting something more stable out to you good folks.