more housekeeping!