changes to pull edits from catalog_data repo, fixes #3