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

fixed links and other bugs