moved around some comments