Added And/OR

Added and/or support for all types and minor changes