Update for new timestamp field in the event message; minor bugfixes