change tolerance and others

i couldn't describe it's too much :-D :+1: