Fixed table/email bugs