Catalog ready, improvements and bug fixes