added OR patterns
added AND patterns, example

Also removed lingering uses of !REP (some bad) in tactics