Updated ConditionalOperators

Added function and various small fixes;