Fixed #EOF calculation and added elapsed time to all events