Add even more grammar elements; make < in tables work