Merged mStrContains to mContains

Also added support for strings to mPartition & mFragment.

Fixed mTSASurround (basic versions)