wrote up proofs of extra cases for lemma 1.5
changed/added to proof of lemmas 3.2 and 3.5
fixed merged conflicts