minor fixes from previous modifications