some changes on the setup script