Improvements

The Event Class may still need some recoding to get the copying of event right.