Minor fixes.

Renamed messanger to messenger. Added event as parameter. Others.