minor housekeeping changes