changes in provisioning, less defaults, simpler config