some minor modifications of the api