adding the rest of the operators, tidying up, adding some color