Adding some links and fixes