fixed links and other bugs