more api etc tweaks