Fixes gh-225 (broken links)
FIx naming, match constructor args to fields