add comments and tiny internal change