Patchwork improvements

[kuba-moo]

We have been trying to add a few small improvements to patchwork for close to a year. There are multiple PRs open. With a little bit of extra funding we may be able to push some of them over the finish line.