Updated links, fixed minot issues