Config update pass for the next release

The proposed Big Reactors change didn't fly and we're going to rethink it. It stays as it is for now.