uncommenting events
fixing changed keys logic