- Improve data store creation on the CLI
- Fix many bugs