api improvements.