Correct Lazy Referencing

this PR suggest a series of correction through the structures prepared in order to resolve lazy referencing.
This comment does not make any sense. Please improve.