socks largely working now. minor bug fixes.