fixed static -> non static conversion problems
re-implemented events into plugins