api: more work towards 0.5 API being usable