better geometry support + polyline16 + correction