Fix link goofiness
Track dockability
Closes #675