fixed broken links and other issues
tweak in url
Fixed merge conflict for pull req #1456