Minor image tweaks (just fixing single-pixel glitches), tweak speed of
farm windmill
solved the merge conflict