Work with catalog and minor fixes.