Additional fixes and comments.