final minor api tweaks