Add some properties to points on the fly while adding to the matrix.
Tidy up things a bit.
Pending code changes.