more minor housekeeping