datastore class ready to review
small fixes