Events modification, and player update
Merge with jorge-stuff