Fix segment construction
Merge pull request #1 from rneatherway/tooltipfixes

Fix segment construction