I have changed that you might like, they fix mostly clustering, etc.