[refactor][s]: common Client object (remove Catalog and have DataStore use Client).
[misc][s]: minor improvements and fixes (esp re Recline stuff).