Adding fetcher and minor bug fixing