update some comments and field names