a couple more improvements in user events parsing