Fix bugs, update webhook api