Some changes and a setup script