updated services and fixed email