Updated OperatorsAndExpressions

Various small fixes