small tweaks to setup script