Improve point collapsing, adjust parameters