better handling of points, minor output adjustments