Add and operator. Better support for the or operator. Improved TeX output.