few small tweaks to the api