Pretty up remaining links, fixes #9