API Fixes

Some large API things were pushed yesterday. This revises some of those
changes.
To be continued...