Currect Lazy Referencing

this PR suggest a series of correction through the structures prepared in order to resolve lazy referencing.
Also, the above comment is wrong.