Adding a link, fixing bugs