Updated links and a few cleanup.