Added in the Logical Operators and fixed the math