some small changes to API