Remove n-vector inclusion
Update wires
Fix .5 factor jump at beginning of pinch