Minor update
Minor fixes
Use catalog.py