Minor changes to image fetcher, WhatIf image fetching bugged