Fix and integrate the documentation