remove some comments and add some potential problems