buffers, spambot, envelopes
updating master
pre merge
fixed the filter/buffer spawning problems