Fixed #21 Overlapping arrows, fixed data propagation per reference