yet more small changes