fixes from KRH remarks