Remaining part of EventStore + fixes