Updated links in readme, and minor fixes