minor fixes and an update to the conf handler