fixed some bugs and added/corrected event time functionality