Rerendered all segments.

Improved instrument name handling.