fix double store & add events to entities
 and minor fixes