API update, small fixes