Several minor changes, a better test image.
Added arbitrary polygons