small api improvments