Docu improvements