fixed email and work bugs