some minor api improvements