Changes to support evaluation of library progress and small API changes.