changed setup script, among other things