Fixed few bugs
Replaced CompiledFormats with VariantComparer
Fixed few bugs
Refactored Variant Comparer
Minor fixes