more tweaks to setup and misc changes