Merge "Add some missing comments"