Fixing orthogonal connection

Seems fixed, however I noticed some erratic behavior. I'm counting on
the next code cleanup to rewrite something more reliable on neighbour
linking