some more housekeeping