Few rearrangements and some tollerance improvements