more label collision work; lines being added back in
label collisions now minimally resolved