update buildout stuff
improve the way queued events are handle