fetcher and small changes