Update/ general bugfix

Added Rodrigos new xmls and fixed some bugs with the events.

Still in 10 sec event mode aka test mode