Black Forest: Update 2.4 - bugfixes and improvements

I have uploaded an update to improve a number of issues that crept in and make some all-around improvements. It is live on preview now, if there are no issues it will go live on the main branch in a few days. Here's the…