apichange: clarification, several fixes