Misc type and link changes

@ajself @darbyfrey #coderetreat