add some more data for event
typos
handle time better