ENH: Comprehend the dictionaries

Thanks @wasade!
DOC/ENH: Use defaultdict and make doc corrections