necessary events parameters adjusted. maybe other events are still
possibly broken
fixes #8; tested