changed names of logical operator enum (and moved thi to global)