fix bugs and change link