So many freaking pitfalls - but all events are working - now only the data must be fixed