update names and add some comments