fixes #65 - eventing still needs some refactoring
fixes #66 - only quick patch as now all the event is 'update' in case of model change... (there is no filtering among them)