Add links and fixes #4