Added Not,And operands.
Modified correctly the Or type check