email and logs improvements