Minor tweaks. Set mail to go to Stephen and Tom as well as me