added support for character events
some renaming