mail fix + other fixes