Add many fixes from Choregie in the togaf.odesign