Add much kinder stuff
Address Misha's feedback