added eventgenerator and build fix