update conf doc / clean up the mess