Add user image pull and add tweaks suggested by JJJ