Cleared up some ambiguities