Merge branch '2023-07-14-assorted-general-updates'

- A number of assorted general fixes and code updates