[ISSUE-185]

Simplify net_fetcher logic, and correct spec mismatches.