many updates to setup script