Updated links and fixed issues