Work on VFF image and some other fixes