minor progress with internal APIs