Set of fixes for the DA + updated documentation (Johny)