address some review concerns
merge review concerns