some fixes added
mandataria first draft added