Email Updation and few fixes