Improvements to the classes.
Configuration correction.