update of documentation + more streamlining