Added sock handler stuff, changed some mux handler stuff