move more stuff from speckcatalog