Fixed it to work with DXF, expanded on shapehelper a bit