Merge pull request #1495 from pennij/mymaster_tues0723

fixed broken links
Merge pull request #1496 from pennij/mymaster_tues0723

fixed links and other bugs
Merge pull request #1497 from pennij/mymaster_tues0723

fixed link again
deleted link per MattShel, Git issue 1489