Fix cross-references in example docs
Fix state-by-state stuff, fix some tests