renamed and fixed setup script