More cleanup

- Adding links