Link shape manager issues

Commits are in for #516, but don't merge just yet, as I'll see what I can do for #517 and #518.