Fixing conf problems and doc