More work on polygons, polygons and circle collision, some refactoring of wireframe