Add missing calls to Final, and more comments.