more comments and tests