Added nconf and cleaned up