Decrease API wait
Fix update functionality