Add PointInfo & fix errors