Rework API calls & tidy up for a v1.0.0 release