Disbanded the fetcher module
Fixed the two bugs found in the review.