bug/typo fixes and udp support