Added support for || and &&, also separated ! and != from the rest, so
it can be removed easily