a few smaller api improvements