minor streamlining change --KW
added contains() method and tests --KW