Added collector, fixed bug with mixed packets on connect