addCommentary improvements