fix TODOs + same comments as for the EquivalenceHashMap