One more fix plus a few more comments.