Improve walk-through events

suela requested to merge fix/events_tweaks into master Apr 16, 2021