more housekeeping...