fix bad import
generalize conjunctions
additional Barrons patterns