some merges from main and some minor fixes and tweaks
fix for my last commit
sorry again more path fixes