Event add and a bit of edit