integrating fixes from review