Wrapped Segments and Trails
more lens clean up
use Wrapped version of diagrams-core
fixed merge conflict