Refactorings
Fixed UDP relaying