fixed some y,x != x,y bugs
Merge branch 'floodfill'