fix bugs and add Amazon feature