Stefans improvements (largely to API)s improvements (largely to API)