some more houskeeping