even more housekeeping