Docstring fixes
Be smarter about keys
Be smarter about hashing keys