fix broken link and another bug