Documentation fixes, clarifications and unification