Merge branch 'master' into more-optimization
sped triangles up some

more improvements would need a better algorithm, and I am not sure how
to do that
Merge branch 'more-optimization'