Part 1 - 5

Fixing broken links, some minor code changes.