Whitespace and nits fix, update conf