Further updates to improve this hash concept.  No more singular_entries
stuff.
WIP spec fixes.