Bugs_fixed in datastore.py