more api tweaks