api: even more edits & tweaks