..
Cleaned/fixed up API code
...