fix up api a bit