Tweaked the UDP bind and a bit of a tidy.