fixed some more ambiguities