demo + docu  improvements