more cleanups+udp bug fix