Fix of resolution logic
Work on semantics documentation: t+