Added better toString() (includes points), and added new constructor