updates to fetcher. not tested but builds
merge