move lemma4 and other tiny cleanups