major modifications to the configuration stuff