move some more to baseconfig