enlil-min, clean-up, and catalog fixes