Squash some bugs
Update TOC and README
Prep for tag