Initial Udp Sink
General cleanup and comments