Misc type and link changes
Merge pull request #39 from shayhowe/misc

Misc type and link changes