changes to generate catalogs
lots of changes, debugging