r19970: more comments and fixes