Reworked image flow fixes most of #169