Added And/or and pipes back. Boy that was embarrassing.
Fixed compiler error