Incorporate improvements from NHS-R ptd package

[Bergam0t]

Some active development has been happening in the last few weeks, potentially including a few bugfixes.

Keep an eye out - potentially for next release? - and incorporate changes in at that point.

Automatic merging unlikely to be possible due to changes but should be fairly painless overall (excluding bits that require dplyr v1+ functions)