fix missing last entry in event list, a few other tweaks