Added delete, fixed basic event functionality