some more house-keeping