docs++ ; small refactorings