Minor data reorganizing and cleanup

There were lots of little problems with data so this and the next
several commits will address those issues.
Clean and add tests for Shortstraw
Better initial sync downloading
Expanded storage adapter functionality