Various Bug Fixes
Event Generator Added