made the datastore prefix option work.. mostly