redid some comments