minor fixes per Alberts comments