Right click to delete added, lots of event fixes