Changed some more point things

PointType is now a class, and added Shape and Generic points.