Fixed a few more
Merge pull request #47 from ericschultz/link-fixes

Fixed a few more