Fixed all the bugs in the Ambiguity Resolver, just the String part left TODO.