address some feedback