fixing email - other small changes