October fixes

Fleshing out the API