All this has been pushed to main. Thanks again!