fixed email format and added a TODO