Removed broken link args + some other cleanup
Merge pull request #95 from sfackler/link

Removed broken link args + some other cleanup