improve docu + remove warning