ensured that we haven't got a problem deleting non-existent entries
sorted out typing in storage, even if it is inefficient
Etags and iterators working as expected