my rebase added too many links, but they are fixed now

There were a couple failing tests