add no longer wraps off-screen or overlaps labels... in all cases so far
merge