Hope api tweaks

A variety of additions, deletions, and fixes, based on Matt's input.