make setup script more complete