Catalog cleanup and mprovements.