Fixed more of the configuration and code configuration issues that are left to get in sync.  Still some more to take care of.