Some improvements

+ speed
+ pseudo-random start