more setup fixes
setup tweaks