Minor fixes, added send_email