Link updates

Fixes #1 (and some other stuff)