still more small changes