Some updates

Hi,

Some fixes and cleans, if needed.

Sincerely,

Daniel Berthereau
Infodoc & Knowledge management