datastore bugfixes, updated Event