minor cleanups

mostly to make there be a simply stated theorem with lemmas