Minor fixes with socket listening. Still a li'l buggy