Tweaks
Changes based on reivew
Merge branch 'trs' into pointgeometry