mathlib3

418a7124 - taking into account most of the comments