API improvements; but some things are not where they should be.