add comments and rename some properties