Add refererences to todo:secondary in more places.
A few scripts to release claims.