WIP updating RC configuration, other configuration fixes and bug fixes

Mostly RC configuration changes, WIP.  Feel free to pull in now or later, will continue working in this config_fixes branch.