fixed rest of non-working merge in rev 71