Finish factoring into base.cfg ; other clean up