fix some problem with Events, add new fields, todo