fixes from reviewer comments