lots of mods, renames, etc - while trying to fix config logic...

yeah, not a great idea to do it all at once, I know…
messing up even more...
not prefect yet, but working again, sort of