-Attempted to fix Catalog parser bugs