address some comments