Added missing promise handles and comments.