added setup
cleaned up setup script