better management of config options.; and correct, too.

Change-Id: I06deb356d1a97de001657894eebe77e110c2f7a4