add express shipping support, fix bugs