- fix iteration over shapes (a bit, stull not bug-free) - added grid (x,y) to output - other tweaks and bugfixes