Merge branch 'udp_fixes'

UDP works fine now, tests included