yet more housekeeping