Merge lcoleman branch

Was unaware until recently that I was working on a separate branch, and have since manually synced updates on main while doing my own work too. This includes the inclusion of Nick's work on Recipes+ branch which, while deleted, I have saved a local copy of should there be any changes I missed.

02/05/2024 @ 05:04:00 Was behind 3 commits so merged just to be on the safe side.