Fixed grammar for Boolean expressions and a few small things.