fixed up conf handling