Add additional Configuration handling and checking. Fix several bugs with option handling.