Made changes to datastore
Bug fixes.