minor corrections + conffile + unit testcase