Fixed issues with loading and saving and getting prepared for the catalog editing feature.