Conjunctions now work (100 percent) plus some other cleanup