Few nitty gritty changes and UDP #5