Cleanup, bugfixes, linkage menu now works

yeah everything that used the linkage menu was borked in that aspect
Revert "Cleanup, bugfixes, linkage menu now works"

This reverts commit a934d01dc59adf9bacbe16c10f4f804212721c2e.
Revert "Revert "Cleanup, bugfixes, linkage menu now works""

This reverts commit fd0e5c944c1975755914c70da11321c72191b9c6.
crap, I accidentally A thing, now if only github would be better at these situations