Updates in nodes and MapEvent

Sync before leaving