restart UDP and some lemma clean up