Fix copying polys to copy in the right order
Cleanup