Got short-circuit operators working.
Patched short-circuit OR and added logical or, and, and xor.