Some API translations, some changes.