fix calls to hash.equals
more collection fixing
more fixes