fixed rendered nested Ands.  No longer flattening Ands in the serializer and will flatten as part of optimization.
refactoring around operator naming.
added mod and regex.