equality checking fix & more generic method names