update Rakuten, and some bug fix