Mmm improves for potential mismatch
Cleanup code
Cleanup code and several optimizations
Updated
Merge Master