clean up small TODOs and continue Catalog save/load methods.