Proper multiple connections support and stop listening support + misc