* API now returns objects (all files changed to be compatible)
* General tidy-up and other misc. changes