more setup tweaks
yet more setup tweaks
more setup reorg