fixed broken links and other issues
tweak in url
Fixed merge conflict for pull req #1456
Merge pull request #1466 from pennij/working_tues0703

Fixed merge conflict for #1456