More new configuration.
Various fixes and improvements.