address some review comments